from trunk
authorKenichi Handa <handa@m17n.org>
Fri, 8 Jan 2010 00:46:18 +0000 (09:46 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 8 Jan 2010 00:46:18 +0000 (09:46 +0900)

Trivial merge